From fbc00c6576110b7fa6442339927a811b648b7492 Mon Sep 17 00:00:00 2001 From: James Bendig Date: Mon, 27 Feb 2017 15:45:39 -0600 Subject: [PATCH] Fixed compile failing because Resolve::features() no longer returns an Option. --- src/cargo/ops/cargo_rustc/context.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/cargo/ops/cargo_rustc/context.rs b/src/cargo/ops/cargo_rustc/context.rs index 4c97cad33..756022dbc 100644 --- a/src/cargo/ops/cargo_rustc/context.rs +++ b/src/cargo/ops/cargo_rustc/context.rs @@ -639,16 +639,13 @@ impl<'a, 'cfg> Context<'a, 'cfg> { // Integration tests/benchmarks require binaries to be built if unit.profile.test && (unit.target.is_test() || unit.target.is_bench()) { - let no_features = HashSet::new(); - let features = self.resolve.features(id).unwrap_or(&no_features); - ret.extend(unit.pkg.targets().iter().filter(|t| { let no_required_features = Vec::new(); t.is_bin() && // Skip binaries with required features that have not been selected. t.required_features().unwrap_or(&no_required_features).iter().all(|f| { - features.contains(f) + self.resolve.features(id).contains(f) }) }).map(|t| { Unit { -- 2.30.2